So, my questions are: 1. How do I remover my domain from the whitelist 2. How do I auto-whitelist based on IP's ?
You don't do any of this using the AWL.. the key here is that it's an AUTOMATIC whitelist. It's not intended for manual configuration. Those manual commands are intended to be temporary corrections, not forced entries.
Also the AWL never white/blacklists on IP alone, that's entirely against it's nature.
First, obliterate your AWL db and start fresh.
Next, set up whitelisting correctly:
Use whitelist_from_rcvd in your configfiles to whitelist your local domain. Make sure to use whitelist_from_rcvd, not whitelist_from, and make sure the rcvd part contains a RDNS string that will match your internal hosts.
OR
create a procmail rule so that local mail skips spamassassin entirely (probably a better solution, as it saves CPU time).