Done some cleanup, stuff that were not supposed to be commited