Cleaned up POMs