Some Changes before maven
Removing for maven