cleaned up old methods