Cleaned up code, and moved old filter to Deprecated