Clean up including removal of uneccessary methods