some cleanup, drop tables service

started using the step annotations
added drop tables service